Replace guts of manual trimmed_strdup in tef reader. Reduce type thrash.

diff --git a/gpsbabel/tef_xml.cc b/gpsbabel/tef_xml.cc
index f03082a99fb90aef0f7ef11d9a89bed85ff2d541..44d0a8a59a79d121ae1c3f276b6b98356685eeca 100644 (file)
--- a/gpsbabel/tef_xml.cc
+++ b/gpsbabel/tef_xml.cc
@@ -47,19 +47,10 @@ static arglist_t tef_xml_args[] = {
 #define MYNAME "TourExchangeFormat"
 
 static char*
-trimmed_strdup(const char* str)
+trimmed_strdup(const QString& str)
 {
-  char* c1, *c2, *res;
-
-  c1 = xstrdup(str);
-  c2 = lrtrim(c1);
-  if (*c2) {
-    res = xstrdup(c2);
-  } else {
-    res = NULL;
-  }
-  xfree(c1);
-  return res;
+  QString trimmed = str.trimmed();
+  return xstrdup(CSTR(trimmed));
 }
 
 static xg_callback     tef_start, tef_header, tef_list_start, tef_list_end;
@@ -112,9 +103,9 @@ tef_header(const char* args, const QXmlStreamAttributes* attrv)
   route = route_head_alloc();
   foreach(QXmlStreamAttribute attr, *attrv) {
     if (attr.name().compare("Name", Qt::CaseInsensitive) == 0) {
-      route->rte_name = trimmed_strdup(attr.value().toString().toUtf8().constData());
+      route->rte_name = trimmed_strdup(attr.value().toString());
     } else if (attr.name().compare("Software", Qt::CaseInsensitive) == 0) {
-      route->rte_desc = trimmed_strdup(attr.value().toString().toUtf8().constData());
+      route->rte_desc = trimmed_strdup(attr.value().toString());
     }
   }
   route_add_head(route);